bitkeeper revision 1.692 (40121d1bBkNbPNTOp6omHUYX1QhV1w)

xl_vbd.c, XenoUtil.py, VBD-HOWTO.txt:
  Fix VBD init code, and move the sqlite db again.

diff --git a/docs/VBD-HOWTO.txt b/docs/VBD-HOWTO.txt
index 9a13404a0a0be6a4e4cbe79edeb2391e615aa358..9abec5d482838428f3d6f50be89ffef3aa6f9c4f 100644 (file)
--- a/docs/VBD-HOWTO.txt
+++ b/docs/VBD-HOWTO.txt
@@ -86,7 +86,7 @@ Virtual Disk Management
 The VD management code runs entirely in userspace.  The code is written in
 Python and can therefore be accessed from custom scripts, as well as from the
 convenience scripts provided.  The underlying VD database is a SQLite database
-in /var/lib/xen_vdisks.sqlite.
+in /var/db/xen_vdisks.sqlite.
 
 The scripts provided are as follows:
 
@@ -131,7 +131,7 @@ More detail:
 
 When you use vd_format.py to add a device to the free space pool, the device is
 logically split up into extents.  These extents are recorded in the Virtual
-Disk Management database in /var/lib/xen_vdisks.sqlite.
+Disk Management database in /var/db/xen_vdisks.sqlite.
 
 When you use vd_create.py to add create a virtual disk, some of the extents in
 the free space pool are reallocated for that virtual disk and a record for that

diff --git a/tools/xc/py/XenoUtil.py b/tools/xc/py/XenoUtil.py
index ee4dd79edc457a13204c8dca4a6e89cad4d7494f..5b0464f96194bba35aa49bbe61bdd42655ec6b69 100644 (file)
--- a/tools/xc/py/XenoUtil.py
+++ b/tools/xc/py/XenoUtil.py
@@ -3,9 +3,9 @@ import string, re, os, sys
 ##### Module variables
 
 """Location of the Virtual Disk management database.
-   defaults to /var/lib/xen_vdisks.sqlite
+   defaults to /var/db/xen_vdisks.sqlite
 """
-VD_DB_FILE = "/var/lib/xen_vdisks.sqlite"
+VD_DB_FILE = "/var/db/xen_vdisks.sqlite"
 
 """VBD expertise level - determines the strictness of the sanity checking.
   This mode determines the level of complaints when disk sharing occurs

diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
index a927df86bc54ea87aaa39f60da7551488f72ea96..b106c57e69156295c9a93a5e4b9c33f91fa7b0b2 100644 (file)
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
+++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
@@ -457,7 +457,7 @@ void xlvbd_update_vbds(void)
         else
         {
             if ( (memcmp(&old_info[i], &new_info[j], sizeof(xen_disk_t)) == 0) ||
-                 (xlvbd_remove_device(old_info[i].device) == 0) )
+                 (xlvbd_remove_device(old_info[i].device) != 0) )
                 memcpy(&merged_info[k++], &old_info[i], sizeof(xen_disk_t));
             else if ( xlvbd_init_device(&new_info[j]) == 0 )
                 memcpy(&merged_info[k++], &new_info[j], sizeof(xen_disk_t));